Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 26 May 2010 12:12:13 +0000 (12:12 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 26 May 2010 12:12:13 +0000 (12:12 +0000)

Trivial merge